Class C Upgrade